Change network topology title to "Upstream" topology

CONTRIBUTING.md

@@ -28,9 +28,9 @@ This project and everyone participating in it is governed by the [IHR Code of Co
 $ git clone [email protected]:<User-Name>/<Repo-Name>.git
 # Add upstream remote
 $ git remote add upstream [email protected]:InternetHealthReport/ihr-website.git 
-# Fetch and merge with upstream/dev
+# Fetch and merge with upstream/master
 $ git fetch upstream
-$ git merge upstream/dev
+$ git merge upstream/master
 
 ## Step 2: Create and Publish Working Branch
 $ git checkout -b <type>/<issue|issue-number>/{<additional-fixes>}
@@ -49,21 +49,21 @@ $ git push origin <type>/<issue|issue-number>/{<additional-fixes>}
 ## Committing and pushing your work
 # Ensure branch
 $ git branch
-# Fetch and merge with upstream/dev
+# Fetch and merge with upstream/master
 $ git fetch upstream
-$ git merge upstream/dev
+$ git merge upstream/master
 # Add untracked files
 $ git add .
 # Commit all changes with appropriate commit message and description
 $ git commit -m "your-commit-message" -m "your-commit-description"
-# Fetch and merge with upstream/dev again
+# Fetch and merge with upstream/master again
 $ git fetch upstream
-$ git merge upstream/dev
+$ git merge upstream/master
 # Push changes to your forked repository
 $ git push origin <type>/<issue|issue-number>/{<additional-fixes>}
 
 ## Creating the PR using GitHub Website
-# Create Pull Request from <type>/<issue|issue-number>/{<additional-fixes>} branch in your forked repository to the dev branch in the upstream repository
+# Create Pull Request from <type>/<issue|issue-number>/{<additional-fixes>} branch in your forked repository to the master branch in the upstream repository
 # After creating PR, add a Reviewer (Any Admin) and yourself as the assignee
 # Link Pull Request to appropriate Issue, or Project+Milestone (if no issue created)
 # IMPORTANT: Do Not Merge the PR unless specifically asked to by an admin.
@@ -75,8 +75,8 @@ $ git push origin <type>/<issue|issue-number>/{<additional-fixes>}
 # Delete branch from forked repo
 $ git branch -d <type>/<issue|issue-number>/{<additional-fixes>}
 $ git push --delete origin <type>/<issue|issue-number>/{<additional-fixes>}
-# Fetch and merge with upstream/dev
-$ git checkout dev
+# Fetch and merge with upstream/master
+$ git checkout master
 $ git pull upstream
 $ git push origin
 ```

README.md

@@ -98,7 +98,7 @@ Please refer to the project's style and contribution guidelines for submitting p
 3. Create a **branch** and name it with the `issue number`
 4. **Commit** changes to the branch
 5. **Push** your work back to your fork
-6. **Rebase** your branch with the `dev` branch
+6. **Rebase** your branch with the `master` branch
 7. Submit your **Pull Request** so that we can review it
 
 Please submit your issues and pull request while following the automated template. During the contributing phase abide by the [Contributing Guidelines](CONTRIBUTING.md) and [Code of Conduct](CODE_OF_CONDUCT.md).

package.json

@@ -1,6 +1,6 @@
 {
   "name": "ihr-website",
-  "version": "1.4.0",
+  "version": "1.4.1",
   "private": true,
   "type": "module",
   "scripts": {

src/components/networks/as/ASOverview.vue

@@ -270,8 +270,8 @@ onMounted(() => {
     <QMarkupTable separator="horizontal">
       <thead>
         <tr>
-          <th class="text-left">IPv4 Network Topology</th>
-          <th class="text-left">IPv6 Network Topology</th>
+          <th class="text-left">IPv4 "Upstream" Topology</th>
+          <th class="text-left">IPv6 "Upstream" Topology</th>
         </tr>
       </thead>
       <tbody>

src/components/networks/prefix/PrefixOverview.vue

@@ -205,7 +205,7 @@ onMounted(() => {
     <QMarkupTable separator="horizontal">
       <thead>
         <tr>
-          <th class="text-left">Network Topology</th>
+          <th class="text-left">"Upstream" Topology</th>
         </tr>
       </thead>
       <tbody>

src/i18n/locales/en.json

@@ -23,8 +23,8 @@
       "summary": "Community Observable notebook showcase"
     },
     "networkTopology": {
-      "name": "Network Topology",
-      "summary": "Network Topology Overview"
+      "name": "\"Upstream\" Topology",
+      "summary": "\"Upstream\" Topology Overview"
     },
     "bgpMonitor": {
       "name": "BGP Monitor",

src/i18n/locales/jp.json

@@ -23,8 +23,8 @@
       "summary": "Community Observable notebook showcase"
     },
     "networkTopology": {
-      "name": "Network Topology",
-      "summary": "Network Topology Overview"
+      "name": "\"Upstream\" Topology",
+      "summary": "\"Upstream\" Topology Overview"
     },
     "bgpMonitor": {
       "name": "BGP Monitor",

src/views/NetworkTopology.vue

@@ -191,7 +191,7 @@ onMounted(async () => {
 
 <template>
   <div class="IHR_char-container">
-    <h1 class="text-center">Network Topology Overview</h1>
+    <h1 class="text-center">"Upstream" Topology Overview</h1>
     <div class="row justify-center">
       <div v-if="chartAmount == 0" class="IHR_description">
         <p>