Skip to content

Commit cc0a781

Browse files
authored
Merge pull request #146 from weaponsforge/dev
v4.0.0-alpha.1
2 parents c0e6723 + 362cd6d commit cc0a781

File tree

51 files changed

+1506
-2431
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+1506
-2431
lines changed

.github/workflows/deploy-dev.yml

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
2-
name: Deploy to Firebase Hosting
1+
name: Development - Deploy to Firebase Hosting
32

43
# This workflow deploys the static-generated nextjs app to Firebase Hosting
54
# Triggered by push to the "dev" branch
@@ -21,6 +20,8 @@ jobs:
2120
steps:
2221
- name: Checkout the repository
2322
uses: actions/checkout@v3
23+
with:
24+
ref: 'dev'
2425
- name: Use NodeJS v16.14.2
2526
uses: actions/setup-node@v3
2627
with:
@@ -38,9 +39,10 @@ jobs:
3839
cd client
3940
npm run export
4041
- name: Archive Development Artifact
41-
uses: actions/upload-artifact@v3
42+
uses: actions/upload-artifact@v4
4243
with:
4344
name: dev-app
45+
include-hidden-files: true
4446
path: |
4547
client/out
4648
client/firebase.json
@@ -53,12 +55,12 @@ jobs:
5355
runs-on: ubuntu-latest
5456
steps:
5557
- name: Download Artifact
56-
uses: actions/download-artifact@v3
58+
uses: actions/download-artifact@v4
5759
with:
5860
name: dev-app
5961
- name: Deploy to Firebase
6062
uses: w9jds/firebase-action@master
6163
with:
62-
args: deploy --only hosting:dev
64+
args: use dev && firebase deploy --only hosting:dev
6365
env:
6466
FIREBASE_TOKEN: ${{ secrets.FIREBASE_TOKEN }}

.github/workflows/release.yml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@ jobs:
1919
steps:
2020
- name: Checkout the repository
2121
uses: actions/checkout@v3
22+
with:
23+
ref: ${{ github.event.release.tag_name }}
2224
- name: Use NodeJS v16.14.2
2325
uses: actions/setup-node@v3
2426
with:
@@ -39,9 +41,10 @@ jobs:
3941
- name: Disable Jekyll
4042
run: touch client/out/.nojekyll
4143
- name: Archive Development Artifact
42-
uses: actions/upload-artifact@v3
44+
uses: actions/upload-artifact@v4
4345
with:
4446
name: main-out
47+
include-hidden-files: true
4548
path: client/out
4649
retention-days: 3
4750

@@ -51,7 +54,7 @@ jobs:
5154
runs-on: ubuntu-latest
5255
steps:
5356
- name: Download Artifact
54-
uses: actions/download-artifact@v3
57+
uses: actions/download-artifact@v4
5558
with:
5659
name: main-out
5760
- name: List files for publish

README.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
## climate-profile-full
1+
## gsites-components
22

33
This project creates rich CSS-styled blog-like **Posts** or **Card-like** thumbnail web pages for embedding in Google Sites as external websites.
44

@@ -7,10 +7,10 @@ It also features a lightweight Content Management System (CMS) for creating and
77
### Online App Demo
88

99
#### Production App
10-
https://weaponsforge.github.io/climate-profile-full/
10+
https://weaponsforge.github.io/gsites-components/
1111

1212
#### Development (Playground) App
13-
https://climate-profile-dev.web.app/
13+
https://gsites-components.web.app/
1414

1515
```
1616
EXAMPLE USER (Development App Only)
@@ -29,7 +29,7 @@ password: useruser
2929
Google Sites Sample Web page:<br>
3030
https://sites.google.com/view/gsites-embed-app/home
3131

32-
![gsites-embed-03-ez-optimized](https://github.com/weaponsforge/climate-profile-full/assets/56998001/21c07402-904d-4e41-9988-9108c8c683cc)
32+
![gsites-embed-03-ez-optimized](https://github.com/weaponsforge/gsites-components/assets/56998001/21c07402-904d-4e41-9988-9108c8c683cc)
3333

3434
### B. Embed a Full Page Containing a Group of File Cards
3535

@@ -42,7 +42,7 @@ https://sites.google.com/view/gsites-embed-app/home
4242
Google Sites Sample Web page:<br>
4343
https://sites.google.com/view/gsites-embed-app/full-page
4444

45-
![gsites-full-embed-ez](https://github.com/weaponsforge/climate-profile-full/assets/56998001/dce2c297-3e3d-4073-a9f2-5f51a2590a91)
45+
![gsites-full-embed-ez](https://github.com/weaponsforge/gsites-components/assets/56998001/dce2c297-3e3d-4073-a9f2-5f51a2590a91)
4646

4747
## Requirements
4848

@@ -82,7 +82,7 @@ https://sites.google.com/view/gsites-embed-app/full-page
8282
## Installation
8383

8484
1. Clone this repository.<br>
85-
`git clone https://github.com/weaponsforge/climate-profile-full.git`
85+
`git clone https://github.com/weaponsforge/gsites-components.git`
8686

8787
2. Install dependencies in the **/client** and **/server** directories.<br>
8888
```

client/.firebaserc

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
{
22
"projects": {
3-
"default": "climate-profile-app"
3+
"dev": "climate-profile-app",
4+
"prod": "gsites-embed"
45
},
56
"targets": {
67
"climate-profile-app": {
@@ -14,7 +15,14 @@
1415
"climate-profile-app.appspot.com"
1516
]
1617
}
18+
},
19+
"gsites-embed": {
20+
"storage": {
21+
"dev": [
22+
"gsites-embed.appspot.com"
23+
]
24+
}
1725
}
1826
},
1927
"etags": {}
20-
}
28+
}

client/README.md

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
## climate-profile-full
1+
## gsites-components
22

33
Testing display of all related content based on a URL query string.
44

@@ -15,10 +15,10 @@ Testing display of all related content based on a URL query string.
1515
### Online Demo
1616

1717
#### Production App
18-
https://weaponsforge.github.io/climate-profile-full/
18+
https://weaponsforge.github.io/gsites-components/
1919

2020
#### Development App
21-
https://climate-profile-dev.web.app/
21+
https://gsites-components.web.app/
2222

2323
```
2424
EXAMPLE USER (Development App Only)
@@ -42,19 +42,27 @@ password: useruser
4242
| NEXT_PUBLIC_FIREBASE_WEB_STORAGE_BUCKET | Firebase web storage bucket key from the Firebase Project Settings configuration file. |
4343
| WATCHPACK_POLLING | Enables hot reload on NextJS apps (tested on NextJS v13.2.1) running inside Docker containers on a Windows host. Set it to `true` if running Docker Desktop with WSL2 on a Windows OS. |
4444

45-
3. Deploy the **Firestore Security Rules** defined in the `"firestore.rules"` file using the Firebase CLI.<br>
45+
3. Switch to the **dev** Firebase target.<br>
46+
`firebase use dev`
47+
48+
4. Deploy the **Firestore Security Rules** defined in the `"firestore.rules"` file using the Firebase CLI.<br>
4649
`firebase deploy --only firestore:rules`
4750

48-
4. Deploy the **Firestore Indexes** defined in the `"firestore.indexes.json"` file using the Firebase CLI.<br>
51+
5. Deploy the **Firestore Indexes** defined in the `"firestore.indexes.json"` file using the Firebase CLI.<br>
4952
`firebase deploy --only firestore:indexes`
5053

51-
5. Deploy the **Firebase Storage Security** Rules defined in the `"storage.rules"` file using the Firebase CLI.<br>
52-
`firebase deploy --only storage:dev`
54+
6. Deploy the **Firebase Storage Security** Rules defined in the `"storage.rules"` file using the Firebase CLI.<br>
55+
`firebase deploy --only storage`
5356

54-
6. Deploy the local website in the `"/out"` directory to **Firebase Hosting** using the Firebase CLI.<br>
57+
7. Deploy the local website in the `"/out"` directory to **Firebase Hosting** using the Firebase CLI.<br>
5558
- (build) `npm run export`
5659
- (deploy) `firebase deploy --only hosting:dev`
5760

61+
8. Switch to the **prod** Firebase target.<br>
62+
`firebase use prod`
63+
64+
9. Repeat from **step # 4 - 6**.
65+
5866
## Usage
5967

6068
1. Run the app in development mode.<br>

client/components/countries/index.js

Lines changed: 0 additions & 33 deletions
This file was deleted.

client/components/profile-centered/index.js

Lines changed: 0 additions & 167 deletions
This file was deleted.

0 commit comments

Comments
 (0)