Merge pull request #77 from dnlnashed/demo-format

Fixed easy to implement demo format and dead layer
ramp4-pcar4 · Sep 18, 2023 · a820134 · a820134
2 parents 2b58e95 + c396fa5
commit a820134
Show file tree

Hide file tree

Showing 6 changed files with 37 additions and 31 deletions.
diff --git a/README.md b/README.md
@@ -1,4 +1,6 @@
-# ramp-website
+# ramp-pcar
+Was previously called ramp-website but had to be renamed to make the endpoint for the website bilingual. 
+If you're looking for the RAMP4 repo, its [here](https://github.com/ramp4-pcar4/ramp4-pcar4).
 
 ## Project setup
 ```

diff --git a/public/config/ramp3/implement.json b/public/config/ramp3/implement.json
@@ -93,7 +93,7 @@
                 "id": "msc150",
                 "name": "MSC150",
                 "layerType": "esriDynamic",
-                "url": "https://maps-cartes.ec.gc.ca/arcgis/rest/services/MSC150/MapServer",
+                "url": "https://section917.canadacentral.cloudapp.azure.com/arcgis/rest/services/MSC150/MapServer",
                 "layerEntries": [
                     {
                         "index": 1

diff --git a/public/config/ramp4/implement.json b/public/config/ramp4/implement.json
@@ -83,7 +83,7 @@
                 {
                     "name": "MSC150",
                     "id": "msc150",
-                    "url": "https://maps-cartes.ec.gc.ca/arcgis/rest/services/MSC150/MapServer",
+                    "url": "https://section917.canadacentral.cloudapp.azure.com/arcgis/rest/services/MSC150/MapServer",
                     "layerType": "esri-map-image",
                     "sublayers": [
                         {

diff --git a/src/components/wet-templates/canada-en.vue b/src/components/wet-templates/canada-en.vue
@@ -23,7 +23,7 @@
                 </li>
             </ul>
             <header>
-                <div id="wb-bnr" class="container">
+                <div id="wb-bnr" class="container mx-auto">
                     <div class="row">
                         <div class="brand col-xs-5 col-md-4" property="publisher" typeof="GovernmentOrganization">
                             <a href="https://www.canada.ca/en.html" property="url"
@@ -93,7 +93,7 @@
                     </div>
                 </div>
                 <nav class="gcweb-menu" typeof="SiteNavigationElement">
-                    <div class="container">
+                    <div class="container mx-auto">
                         <h2 class="wb-inv">Menu</h2>
                         <button type="button" aria-haspopup="true" aria-expanded="false">
                             <span class="wb-inv">Main </span>Menu
@@ -172,7 +172,7 @@
                 </nav>
                 <nav id="wb-bc" property="breadcrumb">
                     <h2>You are here:</h2>
-                    <div class="container">
+                    <div class="container mx-auto">
                         <div class="row">
                             <ol class="breadcrumb">
                                 <li>
@@ -200,7 +200,7 @@
             <!-- Write closure fall-back static file -->
             <footer id="wb-info">
                 <div class="landscape">
-                    <nav class="container wb-navcurr">
+                    <nav class="container mx-auto wb-navcurr">
                         <h2 class="wb-inv">About government</h2>
                         <ul class="list-unstyled colcount-sm-2 colcount-md-3">
                             <li>
@@ -240,7 +240,7 @@
                     </nav>
                 </div>
                 <div class="brand">
-                    <div class="container">
+                    <div class="container mx-auto">
                         <div class="row">
                             <nav class="col-md-10 ftr-urlt-lnk">
                                 <h2 class="wb-inv">About this site</h2>

diff --git a/src/components/wet-templates/canada-fr.vue b/src/components/wet-templates/canada-fr.vue
@@ -22,7 +22,7 @@
                 </li>
             </ul>
             <header>
-                <div id="wb-bnr" class="container">
+                <div id="wb-bnr" class="container mx-auto">
                     <div class="row">
                         <div class="brand col-xs-5 col-md-4">
                             <a href="https://www.canada.ca/fr.html"
@@ -85,7 +85,7 @@
                     </div>
                 </div>
                 <nav class="gcweb-menu" typeof="SiteNavigationElement">
-                    <div class="container">
+                    <div class="container mx-auto">
                         <h2 class="wb-inv">Menu</h2>
                         <button type="button" aria-haspopup="true" aria-expanded="false">
                             Menu<span class="wb-inv"> principal</span>
@@ -166,7 +166,7 @@
                 </nav>
                 <nav id="wb-bc" property="breadcrumb">
                     <h2>Vous êtes ici :</h2>
-                    <div class="container">
+                    <div class="container mx-auto">
                         <div class="row">
                             <ol class="breadcrumb">
                                 <li>
@@ -193,7 +193,7 @@
         <div id="def-footer">
             <footer id="wb-info">
                 <div class="landscape">
-                    <nav class="container wb-navcurr">
+                    <nav class="container mx-auto wb-navcurr">
                         <h2 class="wb-inv">Au sujet du gouvernement</h2>
                         <ul class="list-unstyled colcount-sm-2 colcount-md-3">
                             <li>
@@ -238,7 +238,7 @@
                     </nav>
                 </div>
                 <div class="brand">
-                    <div class="container">
+                    <div class="container mx-auto">
                         <div class="row">
                             <nav class="col-md-10 ftr-urlt-lnk">
                                 <h2 class="wb-inv">À propos du site</h2>

diff --git a/src/views/ExternalSamplePage.vue b/src/views/ExternalSamplePage.vue
@@ -14,25 +14,29 @@
             ></description-block>
         </div>
 
-        <component :is="`canada-${$i18n.locale}`">
+        <div class="!container mx-auto my-[40px]">
             <toggle-version @ramp3="openRAMP3" @ramp4="openRAMP4" :version="version" />
-            <keep-alive>
-                <ramp-map
-                    v-if="version === 3"
-                    :config="config"
-                    :version="3"
-                    :id="`ramp-map3-${config}`"
-                    :key="`ramp-map3-${config}`"
-                />
-                <ramp-map
-                    v-if="version === 4"
-                    :config="config"
-                    :version="4"
-                    :id="`ramp-map4-${config}`"
-                    :key="`ramp-map4-${config}`"
-                />
-            </keep-alive>
-        </component>
+            <div class="border-2 border-black">
+                <component :is="`canada-${$i18n.locale}`">
+                    <keep-alive>
+                        <ramp-map
+                            v-if="version === 3"
+                            :config="config"
+                            :version="3"
+                            :id="`ramp-map3-${config}`"
+                            :key="`ramp-map3-${config}`"
+                        />
+                        <ramp-map
+                            v-if="version === 4"
+                            :config="config"
+                            :version="4"
+                            :id="`ramp-map4-${config}`"
+                            :key="`ramp-map4-${config}`"
+                        />
+                    </keep-alive>
+                </component>
+            </div>
+        </div>
     </div>
 </template>