Skip to content

Commit b923fa0

Browse files
violetforestvioletforest
committed
Merge branch 'develop' of https://github.com/hicetnunc2000/hicetnunc into develop
2 parents f78fc4f + a40b2c7 commit b923fa0

File tree

16 files changed

+654
-562
lines changed

16 files changed

+654
-562
lines changed

‎filters/w.json‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,10 @@
11
[
2+
"tz2BLNQ1quGvYPFbmGHxjGmhKJsW6buJ2FE4",
3+
"tz1RyEXTwLRiM5sbp2tgjDwjgGCbQhbbZHRE",
4+
"tz1YzoJrxMmhan41WCEqRiMxRBqsSYHMiXHx",
5+
"tz1U7CULwvdQXT52Z2J552U3nGtKUFrco1C7",
6+
"tz1R5rtUqx7oeVBkG3XpFiNY5q9GMKj1QVdA",
7+
"tz1YYfZfRwKeQZuQPKD5LeKa7ovp6NuJrYQ7",
28
"tz1RrG7xxSrbMDfr6ECin64pZLGFsQXuptZ8",
39
"tz1ghAevfQy6MRA6Yjg2Vig8RnbbN8NwVdQV",
410
"tz1hV3PL4ikGMM1z76NeagdMJNtNKt2xSZfF",
@@ -308,4 +314,5 @@
308314
"tz1UuMv5Nz1LgcjvE6SBWccimKKVy48jqf4p",
309315
"tz1hYAyDofvWbA6XSTs3KWvfZi57FhtSsMgn",
310316
"tz1RGomsQBqps99ZhnpcMwFhfLXnwxvBkwSb",
317+
"tz1f44eUD12ptYay8x6HkksLe7AAhU1ZLrDi"
311318
]

‎src/components/media-types/html/styles.module.scss‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@
5656
height: 200%;
5757
background: radial-gradient(
5858
circle,
59-
rgba(0, 0, 0, 0.1) 0%,
59+
rgba(0, 0, 0, 0) 70%,
6060
rgba(255, 255, 255, 0.2) 100%
6161
);
6262
}

‎src/components/media-types/index.js‎

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,9 +61,19 @@ export const renderMediaType = (props) => {
6161
url = getInfuraUrl(path)
6262
}
6363
let displayUri = ''
64-
if (metadata && metadata.display_uri) {
65-
displayUri = metadata.display_uri.replace('ipfs://', CLOUDFLARE)
64+
// old
65+
if (metadata && metadata.token_info && metadata.token_info.displayUri) {
66+
displayUri = metadata.token_info.displayUri.replace(
67+
'ipfs://',
68+
CLOUDFLARE
69+
)
6670
}
71+
72+
// new
73+
// if (metadata && metadata.display_uri) {
74+
// displayUri = metadata.display_uri.replace('ipfs://', CLOUDFLARE)
75+
// }
76+
6777
return (
6878
<Container interactive={interactive}>
6979
<HTMLComponent

‎src/pages/display/index.js‎

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -95,16 +95,21 @@ export default class Display extends Component {
9595

9696
// filter market that were created by the user
9797
Object.keys(res.data.swaps).forEach((e) => {
98-
const id = Number(e)
98+
// all swaps include swaps on OBJKT you purchased and OBJKT you minted.
99+
// setting it to false will only display OBJKT that you purchased and put up for sale
100+
// but will NOT include your own art.
101+
const allSwaps = true
99102

100-
const found = sanitised.find((e) => {
101-
return e.token_id === id
102-
})
103-
104-
// if OBJKT wasn't found on the creations then its a swap of someone
105-
// else OBJKT.
106-
if (!found) {
103+
if (allSwaps) {
107104
market[e] = res.data.swaps[e]
105+
} else {
106+
const id = Number(e)
107+
const found = sanitised.find((e) => {
108+
return e.token_id === id
109+
})
110+
if (!found) {
111+
market[e] = res.data.swaps[e]
112+
}
108113
}
109114
})
110115

‎templates/html-image-scale/.babelrc‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"presets": ["@babel/env", "@babel/react"]
3+
}

‎templates/html-image-scale/.parcelrc‎

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

‎templates/html-image-scale/package.json‎

Lines changed: 19 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,30 @@
22
"name": "image-scale",
33
"author": "andrevenancio",
44
"version": "1.0.1",
5+
"private": true,
56
"dependencies": {
6-
"parcel": "^2.0.0-beta.2",
7+
"html-webpack-plugin": "^5.3.1",
78
"react": "^16.14.0",
89
"react-dom": "^16.14.0",
910
"react-zoom-pan-pinch": "^1.6.1"
1011
},
11-
"scripts": {
12-
"start": "parcel ./src/index.html",
13-
"build": "parcel build ./src/index.html"
14-
},
1512
"devDependencies": {
16-
"@parcel/transformer-image": "^2.0.0-beta.2"
13+
"@babel/core": "^7.14.2",
14+
"@babel/plugin-proposal-class-properties": "^7.13.0",
15+
"@babel/preset-env": "^7.14.2",
16+
"@babel/preset-react": "^7.13.13",
17+
"babel-loader": "^8.2.2",
18+
"copy-webpack-plugin": "^8.1.1",
19+
"css-loader": "^5.2.4",
20+
"file-loader": "^6.2.0",
21+
"mini-css-extract-plugin": "^1.6.0",
22+
"node-sass": "^6.0.0",
23+
"sass-loader": "^11.1.1",
24+
"webpack-cli": "^4.7.0",
25+
"webpack-dev-server": "^3.11.2"
26+
},
27+
"scripts": {
28+
"start": "webpack serve --mode development --hot --inline --open",
29+
"build": "webpack --mode production"
1730
}
1831
}

‎templates/html-image-scale/src/app.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import React, { Component } from 'react'
22
import { TransformComponent, TransformWrapper } from 'react-zoom-pan-pinch'
3-
import example_img from 'url:./large.jpg'
3+
import './app.scss'
44

55
export default class App extends Component {
66
constructor(props) {
@@ -178,7 +178,7 @@ export default class App extends Component {
178178
<TransformComponent>
179179
<img
180180
className="zoom"
181-
src={example_img}
181+
src="large.jpg"
182182
alt="example-element"
183183
/>
184184
</TransformComponent>

‎templates/html-image-scale/src/app.scss‎

Lines changed: 78 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,78 @@
1+
html,
2+
body {
3+
width: 100%;
4+
height: 100%;
5+
margin: 0;
6+
padding: 0;
7+
}
8+
9+
body {
10+
overflow: hidden;
11+
background-color: black;
12+
}
13+
14+
* {
15+
-webkit-box-sizing: border-box;
16+
box-sizing: border-box;
17+
-moz-osx-font-smoothing: grayscale;
18+
-webkit-font-smoothing: antialiased;
19+
}
20+
21+
#app {
22+
width: 100vw;
23+
height: 100vh;
24+
display: flex;
25+
align-items: center;
26+
justify-content: center;
27+
}
28+
29+
.container {
30+
position: relative;
31+
}
32+
33+
/* landscape uses vw */
34+
@media (orientation: landscape) {
35+
.container {
36+
width: 100vh;
37+
height: 100vh;
38+
}
39+
}
40+
41+
/* portrait uses vh */
42+
@media (orientation: portrait) {
43+
.container {
44+
width: 100vw;
45+
height: 100vw;
46+
}
47+
}
48+
49+
.element {
50+
position: relative;
51+
width: fit-content;
52+
width: 100%;
53+
}
54+
55+
.element img {
56+
width: 100%;
57+
opacity: 1;
58+
}
59+
60+
.tools {
61+
position: absolute;
62+
top: 4px;
63+
right: 4px;
64+
z-index: 1000;
65+
}
66+
67+
.tools .icon {
68+
background-color: black;
69+
padding: 4px;
70+
border-radius: 4px;
71+
margin-bottom: 4px;
72+
cursor: pointer;
73+
}
74+
75+
.tools .icon svg {
76+
width: 24px;
77+
height: 24px;
78+
}

‎templates/html-image-scale/src/index.html‎

Lines changed: 0 additions & 81 deletions
Original file line numberDiff line numberDiff line change
@@ -6,89 +6,8 @@
66
content="width=device-width, user-scalable=no, minimum-scale=1.0, maximum-scale=1.0"
77
/>
88
<meta property="og:image" content="thumbnail.jpg" />
9-
<style>
10-
html,
11-
body {
12-
width: 100%;
13-
height: 100%;
14-
margin: 0;
15-
padding: 0;
16-
}
17-
18-
body {
19-
overflow: hidden;
20-
background-color: black;
21-
}
22-
23-
* {
24-
-webkit-box-sizing: border-box;
25-
box-sizing: border-box;
26-
-moz-osx-font-smoothing: grayscale;
27-
-webkit-font-smoothing: antialiased;
28-
}
29-
30-
#app {
31-
width: 100vw;
32-
height: 100vh;
33-
display: flex;
34-
align-items: center;
35-
justify-content: center;
36-
}
37-
38-
.container {
39-
position: relative;
40-
}
41-
42-
/* landscape uses vw */
43-
@media (orientation: landscape) {
44-
.container {
45-
width: 100vh;
46-
height: 100vh;
47-
}
48-
}
49-
50-
/* portrait uses vh */
51-
@media (orientation: portrait) {
52-
.container {
53-
width: 100vw;
54-
height: 100vw;
55-
}
56-
}
57-
58-
.element {
59-
position: relative;
60-
width: fit-content;
61-
width: 100%;
62-
}
63-
64-
.element img {
65-
width: 100%;
66-
opacity: 1;
67-
}
68-
69-
.tools {
70-
position: absolute;
71-
top: 4px;
72-
right: 4px;
73-
z-index: 1000;
74-
}
75-
76-
.tools .icon {
77-
background-color: black;
78-
padding: 4px;
79-
border-radius: 4px;
80-
margin-bottom: 4px;
81-
cursor: pointer;
82-
}
83-
84-
.tools .icon svg {
85-
width: 24px;
86-
height: 24px;
87-
}
88-
</style>
899
</head>
9010
<body>
9111
<div id="app"></div>
92-
<script src="./index.js"></script>
9312
</body>
9413
</html>

0 commit comments

Comments
 (0)