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.

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

Update latest envrionment #259

Open
wants to merge 15 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 1 addition & 3 deletions .babelrc
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
{
"presets": [
"@babel/preset-env"
]
"presets": ["@babel/preset-env"]
}
9 changes: 9 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
root = true

[*]
charset = utf-8
end_of_line = lf
insert_final_newline = true
indent_style = space
indent_size = 2
trim_trailing_whitespace = true
27 changes: 27 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
* text=auto

* vue eol=lf encoding=UTF-8
*.css eol=lf encoding=UTF-8
*.html eol=lf encoding=UTF-8
*.js eol=lf encoding=UTF-8
*.jsx eol=lf encoding=UTF-8
*.md eol=lf encoding=UTF-8
*.scss eol=lf encoding=UTF-8
*.ts eol=lf encoding=UTF-8
*.tsx eol=lf encoding=UTF-8
*.txt eol=lf encoding=UTF-8
*.xml eol=lf encoding=UTF-8

# Images
*.gif binary
*.ico binary
*.jpg binary
*.png binary
*.svg eol=lf encoding=UTF-8
*.webp binary

# Fonts
*.eot binary
*.otf binary
*.ttf binary
*.woff binary
1 change: 1 addition & 0 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
# Generated by CODEOWNERS.com
39 changes: 0 additions & 39 deletions .github/workflows/build-and-deploy.yml

This file was deleted.

35 changes: 35 additions & 0 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
name: NodeJS with Webpack

on:
push:
branches: ["master"]
pull_request:
branches: ["master"]

jobs:
build:
runs-on: ubuntu-latest

strategy:
matrix:
node-version: [18.x]

steps:
- name: Checkout 🛎️
uses: actions/checkout@v3

- name: Use Node.js ${{ matrix.node-version }} ⚡
uses: actions/setup-node@v3
with:
node-version: ${{ matrix.node-version }}

- name: Build 🔧
run: |
yarn install
yarn build

- name: Deploy to gh-pages 🚀
uses: JamesIves/[email protected]
with:
branch: gh-pages # The branch the action should deploy to.
folder: dist # The folder the action should deploy.
21 changes: 11 additions & 10 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
_sandbox
.sass-cache
.tmp
/.yarn/*
# !/.yarn/patches
# !/.yarn/plugins
!/.yarn/releases
# !/.yarn/sdks
# !/.yarn/cache
node_modules
!app/node_modules
bower_components
dist
.DS_Store
.publish
*.sublime-workspace
*~
older-version
dist
dist-ssr
*.local
/src/Meta.ts
/docs
4 changes: 4 additions & 0 deletions .ncurc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"upgrade": true,
"reject": ["del", "gulp-imagemin", "pretty-bytes"]
}
11 changes: 11 additions & 0 deletions .prettierrc.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
printWidth: 80
tabWidth: 2
useTabs: false
semi: true
singleQuote: true
trailingComma: es5
bracketSpacing: true
bracketSameLine: false
arrowParens: avoid
htmlWhitespaceSensitivity: ignore
endOfLine: lf
4 changes: 2 additions & 2 deletions .scss-lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ linters:
enabled: false
Shorthand:
# 3 sides are less readable than 4.
allowed_shorthands: [1,2,4]
allowed_shorthands: [1, 2, 4]
SpaceAfterPropertyColon:
enabled: false
# Since we have line length limits in place, sometimes (like with image
Expand All @@ -52,4 +52,4 @@ linters:
UrlFormat:
enabled: false
VendorPrefix:
enabled: false
enabled: false
874 changes: 874 additions & 0 deletions .yarn/releases/yarn-3.6.3.cjs

Large diffs are not rendered by default.

3 changes: 3 additions & 0 deletions .yarnrc.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
nodeLinker: node-modules

yarnPath: .yarn/releases/yarn-3.6.3.cjs
11 changes: 7 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
Android Asset Studio
====================
# Android Asset Studio

**[Open the Android Asset Studio](https://romannurik.github.io/AndroidAssetStudio/)**

Expand All @@ -19,11 +18,15 @@ Currently available asset generators are for:

To build, ensure you have `node` and `npm` installed, and run:

$ npm install
```sh
\$ npm install
```

Once dependencies are installed, run with `gulp`:

$ gulp serve
```sh
\$ gulp serve
```

## Related (third-party) projects

Expand Down
70 changes: 44 additions & 26 deletions app/_base.html
Original file line number Diff line number Diff line change
@@ -1,33 +1,51 @@
<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="chrome=1">
<title>Android Asset Studio{% if title %} - {{ title }}{% endif %}</title>
<head>
<meta charset="utf-8" />
<meta http-equiv="X-UA-Compatible" content="chrome=1" />
<title>Android Asset Studio{% if title %} - {{ title }}{% endif %}</title>

<link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Roboto:400,500|Roboto+Mono:400,500">
<link rel="stylesheet" href="https://fonts.googleapis.com/icon?family=Material+Icons">
<link rel="stylesheet" href="app.css">
<link href="favicon.ico" rel="icon">
<script src="vendor.js"></script>
<script src="app.js"></script>
<link
rel="stylesheet"
href="https://fonts.googleapis.com/css?family=Roboto:400,500|Roboto+Mono:400,500"
/>
<link
rel="stylesheet"
href="https://fonts.googleapis.com/icon?family=Material+Icons"
/>
<link rel="stylesheet" href="app.css" />
<link href="favicon.ico" rel="icon" />
<script src="vendor.js"></script>
<script src="app.js"></script>

{% block head %}
{% endblock %}
</head>
<body class="{{ bodyClasses }}">
{% block body %}
{% endblock %}
{% block head %} {% endblock %}
</head>
<body class="{{ bodyClasses }}">
{% block body %} {% endblock %}

<script>
(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
})(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
<script>
(function (i, s, o, g, r, a, m) {
i['GoogleAnalyticsObject'] = r;
(i[r] =
i[r] ||
function () {
(i[r].q = i[r].q || []).push(arguments);
}),
(i[r].l = 1 * new Date());
(a = s.createElement(o)), (m = s.getElementsByTagName(o)[0]);
a.async = 1;
a.src = g;
m.parentNode.insertBefore(a, m);
})(
window,
document,
'script',
'https://www.google-analytics.com/analytics.js',
'ga'
);

ga('create', 'UA-85278782-1', 'auto');
ga('send', 'pageview');
</script>

</body>
ga('create', 'UA-85278782-1', 'auto');
ga('send', 'pageview');
</script>
</body>
</html>
14 changes: 9 additions & 5 deletions app/_generator-base.html
Original file line number Diff line number Diff line change
@@ -1,14 +1,18 @@
{% extends '_base.html' %}

{% block body %}
{% extends '_base.html' %} {% block body %}
<header class="page-header">
<a class="page-header-back-button icon-button theme-dark" href="index.html">
<i class="material-icons">arrow_back</i>
</a>
<a class="page-header-crumb" href="index.html">Android Asset Studio</a>
<h1 class="page-header-title">{{ title }}</h1>
<div class="page-header-links">
<a target="_blank" class="external-link" href="https://github.com/romannurik/AndroidAssetStudio">Source on GitHub</a>
<a
target="_blank"
class="external-link"
href="https://github.com/romannurik/AndroidAssetStudio"
>
Source on GitHub
</a>
</div>
</header>
<div class="main-container">
Expand All @@ -18,7 +22,7 @@ <h1 class="page-header-title">{{ title }}</h1>
</div>
<div class="outputs-panel">
<label id="grid-toggle-container" class="checkbox">
<input id="grid-toggle" type="checkbox">
<input id="grid-toggle" type="checkbox" />
Show grid
</label>
<button id="download-zip-button" class="fab-button">
Expand Down
2 changes: 1 addition & 1 deletion app/app.entry.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* limitations under the License.
*/

require('babel-polyfill');
import 'babel-polyfill';

import * as pages from './pages';
window.pages = pages;
Expand Down
Loading