Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

put a directory by default in upload #88

Closed
wants to merge 10 commits into from
Closed

put a directory by default in upload #88

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
65dac6f
put a directory by default in upload
alexarts74 Jul 15, 2024
987ae91
Merge branch 'master' into directory-default
alexarts74 Jul 16, 2024
e83c4a1
change workflow for UPLOAD_DIRECTORY name
alexarts74 Jul 17, 2024
afcc31e
upload mode to gh pages by default
alexarts74 Jul 17, 2024
03f60a8
good for worflow
alexarts74 Jul 25, 2024
24cfd31
good for worflow
alexarts74 Jul 25, 2024
1a724fd
rename the workflow for Directory
alexarts74 Jul 25, 2024
2454333
change terms in workflow
alexarts74 Jul 25, 2024
92e999a
change workflow name for upload directory
alexarts74 Jul 25, 2024
361789b
update with map starter kit master branch
alexarts74 Jul 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 10 additions & 7 deletions .github/workflows/build-and-deploy.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,27 +26,30 @@ jobs:
- name: "Build scripts"
run: npm run build

- name: Get API key from secrets
- name: Get API KEY from secrets
env:
MAP_STORAGE_API_KEY: ${{ secrets.MAP_STORAGE_API_KEY }}
run: echo "MAP_STORAGE_API_KEY=${MAP_STORAGE_API_KEY}" >> $GITHUB_ENV

- name: Get Map storage URL from secrets
- name: Get MAP STORAGE URL from secrets
env:
MAP_STORAGE_URL: ${{ secrets.MAP_STORAGE_URL }}
run: echo "MAP_STORAGE_URL=${MAP_STORAGE_URL}" >> $GITHUB_ENV

- name: Get Map storage directory from secrets
env:
DIRECTORY: ${{ secrets.DIRECTORY }}
run: echo "DIRECTORY=${DIRECTORY}" >> $GITHUB_ENV

- name: Generate .env.secret
run: echo "MAP_STORAGE_API_KEY=${{ secrets.MAP_STORAGE_API_KEY }}" > .env.secret

- name: Extract UPLOAD_MODE from .env
run: echo "UPLOAD_MODE=$(grep '^[^#]*UPLOAD_MODE' .env | cut -d '=' -f2)" >> $GITHUB_ENV

- name: Extract UPLOAD DIRECTORY from Github
run: echo "UPLOAD_DIRECTORY=${{ github.actor }}-${{ github.event.repository.name }}" >> $GITHUB_ENV

- name: Create or update .env file
run: |
UPLOAD_DIRECTORY="${{ github.actor }}-${{ github.event.repository.name }}"
echo "UPLOAD_DIRECTORY=${UPLOAD_DIRECTORY}" > .env

- name: Deploy in MAP STORAGE
if: ${{ env.UPLOAD_MODE == 'MAP_STORAGE' }}
run: npm run upload-only
Expand Down
72 changes: 36 additions & 36 deletions conference.tmj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
"width":24,
"x":0,
"y":0
},
},
{
"data":[3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 0, 0, 0, 3, 3,
3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 0, 3, 0, 0, 0, 3, 3,
Expand All @@ -51,7 +51,7 @@
"width":24,
"x":0,
"y":0
},
},
{
"id":55,
"layers":[
Expand Down Expand Up @@ -79,7 +79,7 @@
"width":24,
"x":0,
"y":0
},
},
{
"data":[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
Expand Down Expand Up @@ -111,7 +111,7 @@
"visible":true,
"x":0,
"y":0
},
},
{
"id":54,
"layers":[
Expand Down Expand Up @@ -139,7 +139,7 @@
"width":24,
"x":0,
"y":0
},
},
{
"data":[0, 0, 0, 142, 143, 2147483790, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 152, 153, 2147483800, 0, 0, 0, 0, 0, 62, 63, 63, 63, 63, 63, 64, 90, 0, 0, 0, 90, 0,
Expand Down Expand Up @@ -171,7 +171,7 @@
"visible":true,
"x":0,
"y":0
},
},
{
"id":52,
"layers":[
Expand Down Expand Up @@ -199,7 +199,7 @@
"width":24,
"x":0,
"y":0
},
},
{
"data":[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 834, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 859, 0, 0, 0, 0, 0, 831, 832, 833, 0, 0,
Expand All @@ -224,7 +224,7 @@
"width":24,
"x":0,
"y":0
},
},
{
"data":[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
Expand Down Expand Up @@ -256,7 +256,7 @@
"visible":true,
"x":0,
"y":0
},
},
{
"draworder":"topdown",
"id":2,
Expand All @@ -271,7 +271,7 @@
"name":"jitsiRoom",
"type":"string",
"value":"Conference"
},
},
{
"name":"jitsiTrigger",
"type":"string",
Expand All @@ -283,7 +283,7 @@
"width":219.090909090909,
"x":32,
"y":96
},
},
{
"height":71.612250966399,
"id":19,
Expand All @@ -293,17 +293,17 @@
"name":"dynamic",
"type":"bool",
"value":true
},
},
{
"name":"openWebsite",
"type":"string",
"value":"{{{ websiteURL }}}"
},
},
{
"name":"openWebsiteTrigger",
"type":"string",
"value":"onaction"
},
},
{
"name":"openWebsiteTriggerMessage",
"type":"string",
Expand All @@ -315,7 +315,7 @@
"width":96,
"x":256,
"y":96
},
},
{
"height":96,
"id":22,
Expand All @@ -332,7 +332,7 @@
"width":96,
"x":608,
"y":0
},
},
{
"height":32,
"id":23,
Expand All @@ -355,7 +355,7 @@
"visible":true,
"x":0,
"y":0
},
},
{
"draworder":"topdown",
"id":61,
Expand All @@ -371,17 +371,17 @@
"name":"default",
"type":"string",
"value":"https:\/\/workadventu.re\/admin-guide\/streaming-conferences"
},
},
{
"name":"description",
"type":"string",
"value":"Test the website to embed with an iframe tester like https:\/\/iframetester.com\/"
},
},
{
"name":"label",
"type":"string",
"value":"Website URL"
},
},
{
"name":"persist",
"type":"bool",
Expand All @@ -405,7 +405,7 @@
"visible":true,
"x":0,
"y":0
},
},
{
"id":51,
"layers":[
Expand Down Expand Up @@ -433,7 +433,7 @@
"width":24,
"x":0,
"y":0
},
},
{
"data":[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
Expand Down Expand Up @@ -474,22 +474,22 @@
"name":"mapCopyright",
"type":"string",
"value":"Credits: WorkAdventure (https:\/\/WorkAdventu.re) \nLicense: CC-BY-SA 3.0 (http:\/\/creativecommons.org\/licenses\/by-sa\/3.0\/)"
},
},
{
"name":"mapDescription",
"type":"string",
"value":"A perfect virtual office to get started with WorkAdventure!"
},
},
{
"name":"mapImage",
"type":"string",
"value":"conference.png"
},
},
{
"name":"mapName",
"type":"string",
"value":"Conference"
},
},
{
"name":"script",
"type":"string",
Expand Down Expand Up @@ -521,7 +521,7 @@
}]
}],
"tilewidth":32
},
},
{
"columns":12,
"firstgid":13,
Expand All @@ -534,7 +534,7 @@
"tilecount":96,
"tileheight":32,
"tilewidth":32
},
},
{
"columns":10,
"firstgid":109,
Expand All @@ -547,7 +547,7 @@
"tilecount":110,
"tileheight":32,
"tilewidth":32
},
},
{
"columns":12,
"firstgid":219,
Expand All @@ -560,7 +560,7 @@
"tilecount":156,
"tileheight":32,
"tilewidth":32
},
},
{
"columns":25,
"firstgid":375,
Expand All @@ -573,7 +573,7 @@
"tilecount":1000,
"tileheight":32,
"tilewidth":32
},
},
{
"columns":13,
"firstgid":1375,
Expand All @@ -586,7 +586,7 @@
"tilecount":182,
"tileheight":32,
"tilewidth":32
},
},
{
"columns":10,
"firstgid":1557,
Expand All @@ -599,7 +599,7 @@
"tilecount":270,
"tileheight":32,
"tilewidth":32
},
},
{
"columns":6,
"firstgid":1827,
Expand All @@ -612,7 +612,7 @@
"tilecount":6,
"tileheight":32,
"tilewidth":32
},
},
{
"columns":25,
"firstgid":1833,
Expand All @@ -625,7 +625,7 @@
"tilecount":850,
"tileheight":32,
"tilewidth":32
},
},
{
"columns":13,
"firstgid":2683,
Expand All @@ -643,4 +643,4 @@
"type":"map",
"version":"1.10",
"width":24
}
}
4 changes: 2 additions & 2 deletions index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
margin: 0 auto;
text-align: center;
}

header {
margin: 30px;
}
Expand Down Expand Up @@ -200,4 +200,4 @@ <h2>Connect and get help</h2>
</footer>
</body>

</html>
</html>
Loading
Loading