Skip to content

Commit

Permalink
Instances of Upswyng on user side have been standardized to UpSwyng, … (
Browse files Browse the repository at this point in the history
#386)

* Instances of Upswyng on user side have been standardized to UpSwyng, exception of a few that needs review

* merge master to UpSwyng name standard

* revert unneeded changes

* last changes to UpSwyng name standardization

* fix test

Co-authored-by: jollyjerr <[email protected]>
Co-authored-by: Jacob <[email protected]>
  • Loading branch information
3 people authored Jun 3, 2020
1 parent 0730f91 commit 43bbc2f
Show file tree
Hide file tree
Showing 21 changed files with 49 additions and 49 deletions.
4 changes: 2 additions & 2 deletions CODE_OF_CONDUCT.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# Upswyng's Code of Conduct
# UpSwyng's Code of Conduct

## Our Standards

Upswyng, a Code for Boulder and Code for America project, follows Code for America's expectations for network activities, events, and digital forums:
UpSwyng, a Code for Boulder and Code for America project, follows Code for America's expectations for network activities, events, and digital forums:

1. Are a safe and respectful environment for all participants.
2. Are a place where people are free to fully express their identities.
Expand Down
10 changes: 5 additions & 5 deletions packages/native/README.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
# Upswyng (native)
# UpSwyng (native)

Upswyng is a digital directory that contains information on local services and providers who serve the homeless community in the Boulder area.
UpSwyng is a digital directory that contains information on local services and providers who serve the homeless community in the Boulder area.

This is the React Native version. Check out the web version [here](https://github.com/CodeForBoulder/upswyng/).

<img src='readme_android.png' height=600 alt="Upswyng mockup running on a Pixel phone" />
<img src='readme_android.png' height=600 alt="UpSwyng mockup running on a Pixel phone" />

## Setup

Expand All @@ -27,7 +27,7 @@ Get started here: [https://cloud.google.com/maps-platform/](https://cloud.google

Click `Get Started`, select `Maps` and `Routes` and proceed with the setup.

You will be presented with your key, which you will then need to save to your Upswyng directory's `config.ts` as `REACT_APP_GOOGLE_MAPS_API_KEY: yourUniqueGoogleAPIKeyHere`
You will be presented with your key, which you will then need to save to your UpSwyng directory's `config.ts` as `REACT_APP_GOOGLE_MAPS_API_KEY: yourUniqueGoogleAPIKeyHere`

### Firebase DB Setup (Optional)

Expand Down Expand Up @@ -107,7 +107,7 @@ Installs project dependencies.

### `npm start`

Starts Expo and will allow your virtual device to run Upswyng.
Starts Expo and will allow your virtual device to run UpSwyng.

## Contributing

Expand Down
2 changes: 1 addition & 1 deletion packages/server/cypress/integration/spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@ describe("Provider Portal", () => {
});

it("loads the homepage", () => {
cy.contains("Upswyng Service Provider Portal");
cy.contains("UpSwyng Service Provider Portal");
});
});
4 changes: 2 additions & 2 deletions packages/server/src/components/Nav.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<div class="navbar-brand">
<a class="navbar-item" href="/provider">
<img
alt="Upswyng: Resources within reach"
alt="UpSwyng: Resources within reach"
src="static/upswyng_arrow.svg" />
</a>
<!-- svelte-ignore a11y-missing-attribute -->
Expand Down Expand Up @@ -75,7 +75,7 @@
<span class="tag is-dark">Admin</span>
</a>
<a class="navbar-item" href="/provider/bot" rel="prefetch">
<span class="is-family-monospace">upswyngbot &nbsp;</span>
<span class="is-family-monospace">UpSwyngbot &nbsp;</span>
<span class="tag is-dark">Admin</span>
</a>
<a class="navbar-item" href="/provider/users" rel="prefetch">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ interface TRequest extends ParamsDictionary {

/**
* API endpoint to create a new User Report Resource Issue.
* In an Upswyng client, if a user notices a problem with a Resource
* In an UpSwyng client, if a user notices a problem with a Resource
* (schedule is wrong, phone number is out of service, etc..) they can
* initiate a report saying so through this endpont.
*
Expand Down
4 changes: 2 additions & 2 deletions packages/server/src/routes/provider/alert/create.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -335,7 +335,7 @@
</style>

<svelte:head>
<title>Upswyng: Create an Alert</title>
<title>UpSwyng: Create an Alert</title>
</svelte:head>

<section class="section">
Expand Down Expand Up @@ -656,7 +656,7 @@
</div>
<div class="level-right">
<img
alt="Upswyng icon mock"
alt="UpSwyng icon mock"
src="/static/upswyng_arrow.svg"
class="upswyng-icon" />
</div>
Expand Down
2 changes: 1 addition & 1 deletion packages/server/src/routes/provider/alert/index.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@
</script>

<svelte:head>
<title>Upswyng: Alerts</title>
<title>UpSwyng: Alerts</title>
</svelte:head>

<section class="section">
Expand Down
12 changes: 6 additions & 6 deletions packages/server/src/routes/provider/bot.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -157,23 +157,23 @@
<div class="column is-one-quarter">
<img
class="upswyngbot-logo"
alt="The upswyngbot"
alt="The UpSwyngbot"
src="/static/upswyngbot.svg" />
</div>
<div class="column">
<h1 class="title is-family-monospace">
upswyngbot
UpSwyngbot
<span class="tag is-dark is-family-primary">Admin</span>
</h1>
<h2 class="subtitle">
<span class="is-family-monospace">upswyngbot</span>
<span class="is-family-monospace">UpSwyngbot</span>
runs tasks like checking to make sure the links on UpSwyng aren't
broken. Here is a look at
<span class="is-family-monospace">upswyngbot's</span>
<span class="is-family-monospace">UpSwyngbot's</span>
recent work. To tell
<span class="is-family-monospace">upswyngbot</span>
<span class="is-family-monospace">UpSwyngbot</span>
to do something, message
<span class="is-family-monospace">upswyngbot</span>
<span class="is-family-monospace">UpSwyngbot</span>
on Slack.
</h2>
</div>
Expand Down
2 changes: 1 addition & 1 deletion packages/server/src/routes/provider/category/[stub].svelte
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
</script>

<svelte:head>
<title>Upswyng: {category.name}</title>
<title>UpSwyng: {category.name}</title>
</svelte:head>

<section class="section">
Expand Down
4 changes: 2 additions & 2 deletions packages/server/src/routes/provider/index.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
</style>

<svelte:head>
<title>Upswyng: Service Provider Portal</title>
<title>UpSwyng: Service Provider Portal</title>
</svelte:head>

<section class="hero is-dark">
Expand All @@ -28,7 +28,7 @@
src="/static/upswyng_light.svg" />
</div>
<div class="column">
<h1 class="title">Upswyng Service Provider Portal</h1>
<h1 class="title">UpSwyng Service Provider Portal</h1>
<p class="subtitle">
Welcome to the Provider’s Portal. This is the place to update your
organization’s information so it’s the latest and most accurate for
Expand Down
2 changes: 1 addition & 1 deletion packages/server/src/routes/provider/login.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@

<section class="section">
<div class="container">
<h1 class="title">Login to Upswyng</h1>
<h1 class="title">Login to UpSwyng</h1>
<ul class="sign-in-buttons">
<li>
<FacebookLoginButton href="/connect/facebook" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@
</style>

<svelte:head>
<title>Upswyng: {resource.name}</title>
<title>UpSwyng: {resource.name}</title>
</svelte:head>
<section class="section">
<div class="container">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@
</script>

<svelte:head>
<title>Upswyng: {draftResource.name} [draft]</title>
<title>UpSwyng: {draftResource.name} [draft]</title>
</svelte:head>

<section class="section">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@

<svelte:head>
<title>
Upswyng: Resource Issue{`${resource ? ` for ${resource.name}` : ''}}`}
UpSwyng: Resource Issue{`${resource ? ` for ${resource.name}` : ''}}`}
</title>
</svelte:head>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,7 @@
</style>

<svelte:head>
<title>Upswyng: Service Provider Issues</title>
<title>UpSwyng: Service Provider Issues</title>
</svelte:head>

<section class="section">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
</script>

<svelte:head>
<title>Upswyng: {subcategory.name}</title>
<title>UpSwyng: {subcategory.name}</title>
</svelte:head>

<section class="section">
Expand Down
2 changes: 1 addition & 1 deletion packages/server/src/routes/provider/users.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -256,7 +256,7 @@
</style>

<svelte:head>
<title>Upswyng: Users</title>
<title>UpSwyng: Users</title>
</svelte:head>

<section class="section">
Expand Down
4 changes: 2 additions & 2 deletions packages/server/src/utility/slackbot.ts
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@ try {
webClient = new WebClient(process.env.SLACK_OAUTH_ACCESS_TOKEN);
webClient.auth.test().then(
(_r: SlackWebApi.WebAPICallResult) => {
console.info(`🤖 upswyngbot starting 🚀`);
console.info(`🤖 UpSwyngbot starting 🚀`);
console.info(`🤖 HOST: ${HOST}`);
console.info(`🤖 CHANNEL: ${CHANNEL}`);
console.info(`🤖 upswyngbot connected to web api 😎\n\n`);
console.info(`🤖 UpSwyngbot connected to web api 😎\n\n`);
},
e => {
console.error(`💩 Error getting slackbot auth info: ${e.message}`);
Expand Down
2 changes: 1 addition & 1 deletion packages/web/README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Upswyng
# UpSwyng

[![Netlify Status](https://api.netlify.com/api/v1/badges/d594885b-4ffa-496d-8e1b-78d23f55e6c2/deploy-status)](https://app.netlify.com/sites/upswyng/deploys)
[![Build Status](https://travis-ci.org/CodeForBoulder/upswyng.svg?branch=master)](https://travis-ci.org/CodeForBoulder/upswyng)
Expand Down
4 changes: 2 additions & 2 deletions packages/web/src/components/PrivacyPolicy.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@ const PrivacyPolicy = () => {
<Typography paragraph>
Cookies are pieces of information that some web sites transfer to the
computer that is browsing that web site and are used for record-keeping
purposes at many web sites. Upswyng does not use cookies.
purposes at many web sites. UpSwyng does not use cookies.
</Typography>
<Typography variant="h2" gutterBottom>
Disclosure
Expand Down Expand Up @@ -202,7 +202,7 @@ const PrivacyPolicy = () => {
<Typography paragraph>
Our Site contains links to other web sites. Please note that when you
click on one of these links, you are entering another web site for which
Upswyng.org has no responsibility. We encourage you to read the privacy
UpSwyng.org has no responsibility. We encourage you to read the privacy
statements on all such sites as their policies may be different than
ours. We have no control over information that is submitted to, or
collected by, these third parties.
Expand Down
28 changes: 14 additions & 14 deletions packages/web/src/components/TermsOfUse.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@ const TermsOfUse = () => (
<Container>
<PageBanner color={colors.orangeDark} text={"Terms of Use"} />
<Typography paragraph>
Upswyng provides its content on this website (the “Site”) and mobile
UpSwyng provides its content on this website (the “Site”) and mobile
applications (the “App”) which enable users to locate resources including
food banks, medical centers, and shelters (the “Services”) subject to the
following terms and conditions (the “Terms”). Upswyng may amend the Terms
from time to time. Amendments will be effective upon Upswyng’s posting of
following terms and conditions (the “Terms”). UpSwyng may amend the Terms
from time to time. Amendments will be effective upon UpSwyng’s posting of
such updated Terms at this location. Your continued use of the Services
after such posting confirms your consent to be bound by the Terms, as
amended.
Expand All @@ -24,13 +24,13 @@ const TermsOfUse = () => (
License.
</Typography>
<Typography paragraph>
Subject to compliance with these Terms, Upswyng grants you a limited,
Subject to compliance with these Terms, UpSwyng grants you a limited,
non-exclusive, nonsublicensable, revocable, non-transferable license to:
(i) access and use the Site, or the App on your personal device solely in
connection with your use of the Services; and (ii) access and use any
content, information, and related information that may be made available
through the Services, in each case solely for your personal, noncommercial
use. Any rights not expressely granted herein are reserved Upswyng.
use. Any rights not expressely granted herein are reserved UpSwyng.
</Typography>
<Typography gutterBottom variant="h3">
Restrictions.
Expand All @@ -41,7 +41,7 @@ const TermsOfUse = () => (
derivative works based upon, distribute, license, lease, sell, resell,
transfer, publicly display, publicly perform, transmit, stream, broadcast
or otherwise exploit the Services except as expressly permitted by
Upswyng; (iii) decompile, reverse engineer or disassemble the Services
UpSwyng; (iii) decompile, reverse engineer or disassemble the Services
except as may be permitted by applicable law; (iv) link to, mirror or
frame any portion of the Services; (v) cause or launch any programs or
scripts for the purpose of scraping, indexing, surveying, or otherwise
Expand All @@ -54,21 +54,21 @@ const TermsOfUse = () => (
Ownership.
</Typography>
<Typography paragraph>
The Services and all rights therein are and shall remain Upswyng&apos;s
property or the property of Upswyng&apos;s licensors. Neither these Terms
The Services and all rights therein are and shall remain UpSwyng&apos;s
property or the property of UpSwyng&apos;s licensors. Neither these Terms
nor your use of the Services convey or grant to you any rights: (i) in or
related to the Services except for the limited license granted above; or
(ii) to use or reference in any manner Upswyng&apos;s company names,
(ii) to use or reference in any manner UpSwyng&apos;s company names,
logos, product and service names, trademarks or services marks or those of
Upswyng&apos;s licensors.
UpSwyng&apos;s licensors.
</Typography>
<Typography gutterBottom variant="h3">
Copyrights.
</Typography>
<Typography paragraph>
All content and functionality on the Site, including text, graphics,
logos, icons, and images and the selection and arrangement thereof is the
exclusive property of Upswyng or its licensors and is protected by U.S.
exclusive property of UpSwyng or its licensors and is protected by U.S.
copyright laws. All rights not expressly granted are reserved.
</Typography>
<Typography gutterBottom variant="h2">
Expand Down Expand Up @@ -132,7 +132,7 @@ const TermsOfUse = () => (
Indemnity.
</Typography>
<Typography paragraph>
You agree to indemnify and hold Upswyng and its affiliates and their
You agree to indemnify and hold UpSwyng and its affiliates and their
officers, directors, employees, and agents harmless from any and all
claims, demands, losses, liabilities, and expenses (including
attorneys&apos; fees), arising out of or in connection with: (i) your use
Expand All @@ -146,8 +146,8 @@ const TermsOfUse = () => (
Privacy Policy
</Typography>
<Typography paragraph>
In accordance with the terms of upswyng.org&apos;s Privacy Policy, Upswyng
respect&apos;s the privacy of its Users. Upswyng recommends users read its
In accordance with the terms of UpSwyng.org&apos;s Privacy Policy, UpSwyng
respect&apos;s the privacy of its Users. UpSwyng recommends users read its
Privacy Policy, available in the main menu, before using the website or
app.
</Typography>
Expand Down

0 comments on commit 43bbc2f

Please sign in to comment.