Skip to content
This repository has been archived by the owner on Aug 12, 2024. It is now read-only.

Commit

Permalink
all: remove branding
Browse files Browse the repository at this point in the history
  • Loading branch information
OxygenCobalt committed Jul 11, 2024
1 parent dccc468 commit 5efcd38
Show file tree
Hide file tree
Showing 26 changed files with 61 additions and 61 deletions.
8 changes: 4 additions & 4 deletions CODEOWNERS
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
# Leads
* @OreCart/leads
* @OreCode/leads

# general
backend/ @OreCart/backend @OreCart/code-reviewers
frontend/ @OreCart/frontend @OreCart/code-reviewers
frontend-admin/ @OreCart/frontend-admin @OreCart/code-reviewers
backend/ @OreCode/backend @OreCode/code-reviewers
frontend/ @OreCode/frontend @OreCode/code-reviewers
frontend-admin/ @OreCode/frontend-admin @OreCode/code-reviewers

# DevOps Things
.github/ @tbwrigh
Expand Down
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@
same "printed page" as the copyright notice for easier
identification within third-party archives.

Copyright 2023 The OreCart Team
Copyright 2023 The OreCode Team

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand Down
10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# Ore Cart App [![License](https://img.shields.io/badge/License-Apache_2.0-blue.svg)](https://opensource.org/licenses/Apache-2.0)

The master monorepo for all OreCart app software! The OreCart app includes a backend made with [FastAPI](https://fastapi.tiangolo.com), an admin dashboard built with [React](https://react.dev/)/[Vite](https://v3.vitejs.dev/guide/), and a crossplatform mobile app made with [React-Native](https://reactnative.dev).
The master monorepo for all OreCode app software! The OreCode app includes a backend made with [FastAPI](https://fastapi.tiangolo.com), an admin dashboard built with [React](https://react.dev/)/[Vite](https://v3.vitejs.dev/guide/), and a crossplatform mobile app made with [React-Native](https://reactnative.dev).

For full documentation and project details, please see the Google Drive (ask leads for access) and [orecart.github.io](https://orecart.github.io). The frontend, frontend-admin, and backend folders have READMEs with more information about developing in each as well.
For full documentation and project details, please see the Google Drive (ask leads for access) and [orecode.github.io](https://orecode.github.io). The frontend, frontend-admin, and backend folders have READMEs with more information about developing in each as well.

## General Environment Setup

Expand All @@ -22,7 +22,7 @@ To start the application in a development mode (it will restart when files are s

## Contribution Guidelines

Contributors (aka "The OreCart Team") must be approved by the current [OreCart/leads](https://github.com/orgs/OreCart/teams/leads) team.
Contributors (aka "The OreCode Team") must be approved by the current [OreCode/leads](https://github.com/orgs/OreCode/teams/leads) team.
Outside contributors are not allowed unless explicit approval is granted by leads.

Do not push code directly to main -- the branch is locked for this anyways! Please use branches for each new feature and submit a pull request when ready.
Expand All @@ -32,5 +32,5 @@ Each pull request requires a **minimum of two relevant reviewers** (leads or tea

## Legal Notices

Any references to Colorado School of Mines (aka "Mines", "CSM"), Innov8x, or official OreCart brand identity are used with
permission for this project, however, this project is not owned by Mines or Mines ACM itself. See the [LICENSE](https://github.com/OreCart/OreCart-App/blob/main/LICENSE) for more details.
Any references to Colorado School of Mines (aka "Mines", "CSM"), Innov8x, or official OreCode brand identity are used with
permission for this project, however, this project is not owned by Mines or Mines ACM itself. See the [LICENSE](https://github.com/OreCode/OreCode-App/blob/main/LICENSE) for more details.
2 changes: 1 addition & 1 deletion backend/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ The backend will be used to store locations of the shuttles, serve that data to

The backend is a Python based project. It uses FastAPI, SQLAlchemy and Alembic.

The structure of the project is fairily simple. The tests are in the tests folder and the main source code is in the source folder. The database schema is defined in the alembic folder, but it should not be changed without first discussing with a member of the [OreCart/leads](https://github.com/orgs/OreCart/teams/leads) team. At that time, they will assist in updating the alembic models.
The structure of the project is fairily simple. The tests are in the tests folder and the main source code is in the source folder. The database schema is defined in the alembic folder, but it should not be changed without first discussing with a member of the [OreCode/leads](https://github.com/orgs/OreCode/teams/leads) team. At that time, they will assist in updating the alembic models.

### Src Folder Tour

Expand Down
2 changes: 1 addition & 1 deletion backend/src/handlers/routes.py
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ def get_kml(req: Request):

k = kml.KML()
ns = "{http://www.opengis.net/kml/2.2}"
d = kml.Document(ns, "3.14", "Routes", "Routes for the OreCart app.")
d = kml.Document(ns, "3.14", "Routes", "Routes for the OreCode app.")
k.append(d)

for route in routes:
Expand Down
12 changes: 6 additions & 6 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ version: "3.9"

services:
database:
container_name: orecart-database
container_name: orecode-database
image: postgres
restart: always
healthcheck:
Expand All @@ -14,13 +14,13 @@ services:
ports:
- 5432:5432
volumes:
- orecart-db-dev-volume:/var/lib/postgresql/data
- orecode-db-dev-volume:/var/lib/postgresql/data
env_file:
- database.env
networks:
- dev
migration:
container_name: orecart-migration
container_name: orecode-migration
build: ./backend
command: alembic upgrade head
env_file:
Expand All @@ -31,7 +31,7 @@ services:
networks:
- dev
backend:
container_name: orecart-backend
container_name: orecode-backend
build: ./backend
restart: always
ports:
Expand All @@ -50,7 +50,7 @@ services:
networks:
- dev
frontend-admin:
container_name: orecart-frontend-admin
container_name: orecode-frontend-admin
build: ./frontend-admin
restart: always
ports:
Expand All @@ -73,4 +73,4 @@ networks:
dev:

volumes:
orecart-db-dev-volume: {}
orecode-db-dev-volume: {}
4 changes: 2 additions & 2 deletions frontend/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -72,13 +72,13 @@ You can read more about api key config in the [MapView Documentation](https://do
You can then create a preview build with this:

```
npx eas build -p android --local -e preview --output builds/OreCart_Preview.apk
npx eas build -p android --local -e preview --output builds/OreCode_Preview.apk
```

You can then create a production build with this:

```
npx eas build -p android --local -e production --output builds/OreCart_Production.apk
npx eas build -p android --local -e production --output builds/OreCode_Production.apk
```

## Building on iOS
Expand Down
14 changes: 7 additions & 7 deletions frontend/app.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ if (process.env.ORECART_API_SECURE === "1") {
}

module.exports = {
name: "OreCart",
slug: "orecart",
name: "OreCode",
slug: "orecode",
version: "1.0.4",
orientation: "portrait",
icon: "./assets/icon.png",
Expand All @@ -24,18 +24,18 @@ module.exports = {
assetBundlePatterns: ["**/*"],
ios: {
supportsTablet: true,
bundleIdentifier: "edu.mines.orecart.app",
bundleIdentifier: "edu.mines.orecode.app",
buildNumber: "4",
config: {
googleMapsApiKey: process.env.GOOGLE_MAPS_API_KEY_IOS,
},
infoPlist: {
NSLocationWhenInUseUsageDescription:
"We need to access your location while using the app in order to provide accurate time estimates for OreCarts near you.",
"We need to access your location while using the app in order to provide accurate time estimates for OreCodes near you.",
},
},
android: {
package: "edu.mines.orecart.app",
package: "edu.mines.orecode.app",
versionCode: 4,
adaptiveIcon: {
foregroundImage: "./assets/adaptive-icon.png",
Expand All @@ -60,7 +60,7 @@ module.exports = {
"expo-location",
{
locationAlwaysAndWhenInUsePermission:
"We need to access your location while using the app in order to provide accurate time estimates for OreCarts near you.",
"We need to access your location while using the app in order to provide accurate time estimates for OreCodes near you.",
},
],
],
Expand All @@ -71,5 +71,5 @@ module.exports = {
projectId: "a3e0fe9f-6732-488e-8a42-be63d20b24f9",
},
},
owner: "orecart",
owner: "orecode",
};
Binary file modified frontend/assets/adaptive-icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified frontend/assets/favicon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified frontend/assets/icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified frontend/assets/splash.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified frontend/assets/van_indicator.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions frontend/credentials.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"android": {
"keystore": {
"keystorePath": "./keys/OreCart.jks",
"keystorePath": "./keys/OreCode.jks",
"keystorePassword": "YOUR_PASSWORD",
"keyAlias": "OreCart",
"keyAlias": "OreCode",
"keyPassword": "YOUR_PASSWORD"
}
},
Expand Down
4 changes: 2 additions & 2 deletions frontend/eas.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"buildType": "apk"
},
"env": {
"ORECART_API_DOMAIN": "orecart-backend.tbwright.dev",
"ORECART_API_DOMAIN": "orecode-backend.tbwright.dev",
"ORECART_API_SECURE": "1",
"GOOGLE_MAPS_API_KEY_IOS": "KEY",
"GOOGLE_MAPS_API_KEY_ANDROID": "KEY"
Expand All @@ -25,7 +25,7 @@
"credentialsSource": "local"
},
"env": {
"ORECART_API_DOMAIN": "orecart-backend.tbwright.dev",
"ORECART_API_DOMAIN": "orecode-backend.tbwright.dev",
"ORECART_API_SECURE": "1",
"GOOGLE_MAPS_API_KEY_IOS": "KEY",
"GOOGLE_MAPS_API_KEY_ANDROID": "KEY"
Expand Down
4 changes: 2 additions & 2 deletions frontend/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion frontend/package.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"name": "orecart",
"name": "orecode",
"version": "1.0.0",
"main": "node_modules/expo/AppEntry.js",
"scripts": {
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/features/landing/RouteItem.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ export const RouteItem = ({
body={(arrivalEstimate: number | undefined) =>
arrivalEstimate !== undefined ? (
<Text>
Next OreCart in{" "}
Next OreCode in{" "}
<Text style={styles.emphasis}>
{formatSecondsAsMinutes(arrivalEstimate)}
</Text>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ const LocationPermissionPrompt = (): React.JSX.Element | null => {
return (
<View style={styles.container}>
<Text style={styles.message}>
Allow OreCart to access your location to see nearby stops and arrival
Allow OreCode to access your location to see nearby stops and arrival
estimates
</Text>

Expand Down
2 changes: 1 addition & 1 deletion frontend/src/features/routes/RouteStopItem.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ export const RouteStopItem = ({
body={(arrivalEstimate: number | undefined) =>
arrivalEstimate !== undefined ? (
<>
Next OreCart in{" "}
Next OreCode in{" "}
<Text style={styles.emphasis}>
{formatSecondsAsMinutes(arrivalEstimate)}
</Text>
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/features/stops/StopRouteItem.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ export const StopRouteItem = ({
body={(arrivalEstimate: number | undefined) =>
arrivalEstimate !== undefined ? (
<>
Next OreCart in{" "}
Next OreCode in{" "}
<Text style={styles.emphasis}>
{formatSecondsAsMinutes(arrivalEstimate)}
</Text>
Expand Down
20 changes: 10 additions & 10 deletions nginx.conf
Original file line number Diff line number Diff line change
Expand Up @@ -9,20 +9,20 @@ http {
'' close;
}

upstream orecart-backend {
server orecart-backend:8000; # Replace PORT with your prod backend's port
upstream orecode-backend {
server orecode-backend:8000; # Replace PORT with your prod backend's port
}

upstream orecart-backend-staging {
server orecart-backend-staging:8000; # Replace PORT with your staging backend's port
upstream orecode-backend-staging {
server orecode-backend-staging:8000; # Replace PORT with your staging backend's port
}

server {
listen 80;
server_name orecart-backend.tbwright.dev;
server_name orecode-backend.tbwright.dev;

location / {
proxy_pass http://orecart-backend;
proxy_pass http://orecode-backend;

proxy_http_version 1.1;
proxy_set_header Upgrade $http_upgrade;
Expand All @@ -31,7 +31,7 @@ http {
}

location ~ ^/vans/ {
proxy_pass http://orecart-backend;
proxy_pass http://orecode-backend;
proxy_http_version 1.1;
proxy_set_header Upgrade $http_upgrade;
proxy_set_header Connection $connection_upgrade;
Expand All @@ -42,18 +42,18 @@ http {

location /mirror {
internal;
proxy_pass http://orecart-backend-staging$request_uri;
proxy_pass http://orecode-backend-staging$request_uri;
proxy_set_header Host $host;
proxy_set_header X-Original-URI $request_uri;
}
}

server {
listen 80;
server_name orecart-backend-staging.tbwright.dev;
server_name orecode-backend-staging.tbwright.dev;

location / {
proxy_pass http://orecart-backend-staging;
proxy_pass http://orecode-backend-staging;

proxy_http_version 1.1;
proxy_set_header Upgrade $http_upgrade;
Expand Down
4 changes: 2 additions & 2 deletions nginx.docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@ services :
volumes:
- ./nginx.conf:/etc/nginx/nginx.conf
networks:
- orecart-app_prod
- orecode-app_prod
- staging_staging

networks:
orecart-app_prod:
orecode-app_prod:
external: true
staging_staging:
external: true
2 changes: 1 addition & 1 deletion package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 5 additions & 5 deletions prod.docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ version: "3.9"

services:
database:
container_name: orecart-database
container_name: orecode-database
image: postgres
restart: always
healthcheck:
Expand All @@ -12,13 +12,13 @@ services:
retries: 10
start_period: 10s
volumes:
- orecart-db-volume:/var/lib/postgresql/data
- orecode-db-volume:/var/lib/postgresql/data
env_file:
- database.env
networks:
- prod
migration:
container_name: orecart-migration
container_name: orecode-migration
build: ./backend
command: alembic upgrade head
env_file:
Expand All @@ -29,7 +29,7 @@ services:
networks:
- prod
backend:
container_name: orecart-backend
container_name: orecode-backend
build: ./backend
restart: always
env_file:
Expand All @@ -49,4 +49,4 @@ networks:
prod:

volumes:
orecart-db-volume: {}
orecode-db-volume: {}
Loading

0 comments on commit 5efcd38

Please sign in to comment.